x86: Use gfn_to_mfn() rather than gfn_to_mfn_current() in callers

which can execute on arbitrary domains.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c
index f1c54983d725f27ed47722baae8150fc18db7b05..62a805750a215453183dd6696101461614db2566 100644 (file)
--- a/xen/arch/x86/mm/hap/guest_walk.c
+++ b/xen/arch/x86/mm/hap/guest_walk.c
@@ -83,7 +83,7 @@ unsigned long hap_gva_to_gfn(GUEST_PAGING_LEVELS)(
     gpfn = (gcr3 >> PAGE_SHIFT);
     for ( lev = mode; lev >= 1; lev-- )
     {
-        mfn = mfn_x(gfn_to_mfn_current(gpfn, &p2mt));
+        mfn = mfn_x(gfn_to_mfn(v->domain, gpfn, &p2mt));
         if ( !p2m_is_ram(p2mt) )
         {
             HAP_PRINTK("bad pfn=0x%lx from gva=0x%lx at lev%d\n", gpfn, gva,

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 93f9489559eb6d5ea9c8e11fe420410869ac262d..d32498092e0abecb89891818ba8192d5d1a5274e 100644 (file)
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -748,7 +748,7 @@ static void audit_p2m(struct domain *d)
 
         if ( test_linear && (gfn <= d->arch.p2m->max_mapped_pfn) )
         {
-            lp2mfn = mfn_x(gfn_to_mfn_current(gfn, &type));
+            lp2mfn = mfn_x(gfn_to_mfn(d, gfn, &type));
             if ( lp2mfn != mfn_x(p2mfn) )
             {
                 P2M_PRINTK("linear mismatch gfn %#lx -> mfn %#lx "